From 7dd9f8bbd8d4822e0ea16697caba00d13df51200 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 29 Jan 2018 17:52:54 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 450134 -> 450274 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 3d6e6c40234..768d6271aa7 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -77,6 +77,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index 1ae13e05a6e0c88137b0f345aa8a7cd04a73ec0b..a368d9ca440c2d1792b1da0199183949bf1bcabd 100644 GIT binary patch delta 166 zcmcb%NBYrT>4p}@7N!>F7M3ln%*FMYX$mE&#U%>56$<*L#YOr_nR)st1=;DkNu`-N zDQP*0>BZIxB^jxCTnZ52;TYuN>KE@E5a8zH=pJmFfTmhOS2sPiL;)tRU}UGCl3J#p jSDKTPz?GKC<>(wA9O@Jtq5(FD3t>`QG3&Nswy>4p}@7N!>F7M3ln%*E~f#jM-=i`jy+0k&`pJOBUy diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b87f6fc569d..129a5ab7f65 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -238,6 +238,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # This is used to detect whether LibreOffice is being built (as opposed to building -- 2.30.2